From 53b6653c7e1085feb8f9bb1a99a4e2d4bc1b6d0d Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Sun, 12 Aug 2018 07:13:03 +0100 Subject: [PATCH] debian-hardened-buildflags-CPPFLAGS Gbp-Pq: Name debian-hardened-buildflags-CPPFLAGS.diff --- config_host.mk.in | 1 + configure.ac | Bin 458960 -> 459100 bytes solenv/gbuild/gbuild.mk | 2 ++ 3 files changed, 3 insertions(+) diff --git a/config_host.mk.in b/config_host.mk.in index df3432d1ff3..7e6b38f11fb 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -80,6 +80,7 @@ export CPPUNIT_CFLAGS=$(gb_SPACE)@CPPUNIT_CFLAGS@ export CPPUNIT_LIBS=$(gb_SPACE)@CPPUNIT_LIBS@ export CPUNAME=@CPUNAME@ export CDEFAULTOPT=@CDEFAULTOPT@ +export HARDEN_CPPFLAGS=@HARDEN_CPPFLAGS@ export CROSS_COMPILING=@CROSS_COMPILING@ export CURL=@CURL@ export CURL_CFLAGS=$(gb_SPACE)@CURL_CFLAGS@ diff --git a/configure.ac b/configure.ac index a3a627db38ebf838601acdaf09e5b0fe5af31ca9..c900a52f0356654c986b8ab852d906f1232d6fd5 100644 GIT binary patch delta 176 zcmcc6D08PtrlEzgg{g(Pg=GutgW2_&X$mE&#U%>56$<*L#YOr_nR)st1=;DkNu`-N zDQP*0>BZIxB^jxCTnZ52;TYuN>KE@E5a8zH=pJmFfTmhOS2sPiL;)tRU}UGCl3J#p uSDKTPz?GKC<>(wA9O@Jtq5(FD7h#en7uWQ_xvWy{zh<*;|23QKS_%M}0XnDv delta 34 qcmcc9By*urrlEzgg{g(Pg=GutgW1#X&SjNqZ=1uqy=@NLwG;sSa}KQl diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index b87f6fc569d..129a5ab7f65 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -238,6 +238,8 @@ gb_GLOBALDEFS += \ ENABLE_LTO \ ) +gb_GLOBALDEFS += $(HARDEN_CPPFLAGS) + gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS)) # This is used to detect whether LibreOffice is being built (as opposed to building -- 2.30.2